From 7fd9f2d31eb623a41cece887bc6b412121001f3d Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Fri, 16 Mar 2018 22:11:58 +0000 Subject: [PATCH] =?utf8?q?Notebook:=20Don=E2=80=99t=20show=20raw=20underli?= =?utf8?q?ne/markup=20in=20popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If @menu_label == NULL, we create a default page->menu_label. This took @tab_label.get_label() and passed that to page->menu_label.set_text(). This is wrong because we set the plain text of the menu_label from the rich text of @tab_label. So, if @tab_label used mnemonics or markup, our menu_label got the raw underline or markup tags shown in it as raw text. As we call set_text() on the menu Label, the fix is to be symmetric: use @tab_label’s get_text() as source, as that strips underlines and markup. It’s not worth making the default Label ‘inherit’ :use-underline/markup; that’s a slippery slope, and users wanting such things can just create a fully fledged GtkLabel to pass as @menu_label to suppress the default. https://bugzilla.gnome.org/show_bug.cgi?id=705509 --- gtk/gtknotebook.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 397fdb7b58..363f370d99 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -5146,7 +5146,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook) { if (GTK_IS_LABEL (page->tab_label)) gtk_label_set_text (GTK_LABEL (page->menu_label), - gtk_label_get_label (GTK_LABEL (page->tab_label))); + gtk_label_get_text (GTK_LABEL (page->tab_label))); else gtk_label_set_text (GTK_LABEL (page->menu_label), string); } @@ -6350,7 +6350,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook, if (page->default_menu) { if (GTK_IS_LABEL (page->tab_label)) - page->menu_label = gtk_label_new (gtk_label_get_label (GTK_LABEL (page->tab_label))); + page->menu_label = gtk_label_new (gtk_label_get_text (GTK_LABEL (page->tab_label))); else page->menu_label = gtk_label_new (""); gtk_widget_set_halign (page->menu_label, GTK_ALIGN_START); -- 2.30.2